From: Jan D. <jan.h.d@swipnet.se>
Date: Wed, 19 Jan 2011 22:13:54 +0000 (+0100)
Subject: * unexmacosx.c: Include config.h before unistd.h.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5140
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1bb1fb91c3cf7236978e01ca6c62274081c99350;p=emacs.git

* unexmacosx.c: Include config.h before unistd.h.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5859aa20db5..5c1a08cd22d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-01-19  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* unexmacosx.c: Include config.h before unistd.h (Bug#7859).
+
 	* nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
 	(ns_input_line, ns_input_color, ns_input_text, ns_working_text)
 	(ns_input_spi_name, ns_input_spi_arg)
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 75d6677f535..d3cf74eb33c 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -91,6 +91,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <config.h>
+#undef malloc
+#undef realloc
+#undef free
 #include <unistd.h>
 #include <mach/mach.h>
 #include <mach-o/loader.h>
@@ -98,10 +102,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #if defined (__ppc__)
 #include <mach-o/ppc/reloc.h>
 #endif
-#include <config.h>
-#undef malloc
-#undef realloc
-#undef free
 #ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #else